diff --git a/apache-commons-net.spec b/apache-commons-net.spec
index b3589e8..c02cd9a 100644
--- a/apache-commons-net.spec
+++ b/apache-commons-net.spec
@@ -1,13 +1,10 @@
-%global base_name    net
-%global short_name   commons-%{base_name}
-
-Name:           apache-%{short_name}
+Name:           apache-commons-net
 Version:        3.8.0
 Release:        1%{?dist}
 Summary:        Internet protocol suite Java library
 License:        ASL 2.0
-URL:            http://commons.apache.org/%{base_name}/
-Source0:        http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+URL:            http://commons.apache.org/net/
+Source0:        http://archive.apache.org/dist/commons/net/source/commons-net-%{version}-src.tar.gz
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
 
@@ -31,7 +28,7 @@ Summary:    API documentation for %{name}
 %{summary}.
 
 %prep
-%setup -q -n %{short_name}-%{version}-src
+%setup -q -n commons-net-%{version}-src
 
 # This test fails with "Connection timed out"
 rm src/test/java/org/apache/commons/net/time/TimeTCPClientTest.java
@@ -43,8 +40,8 @@ rm src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java
 %pom_remove_dep org.apache.ftpserver:ftpserver-core
 rm src/test/java/org/apache/commons/net/ftp/FTPSClientTest.java
 
-%mvn_file  : %{short_name} %{name}
-%mvn_alias : org.apache.commons:%{short_name}
+%mvn_file  : commons-net %{name}
+%mvn_alias : org.apache.commons:commons-net
 
 %build
 %mvn_build -- -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7 -Dcommons.osgi.symbolicName=org.apache.commons.net