diff --git a/ipalib/plugins/aci2.py b/ipalib/plugins/aci.py
similarity index 100%
rename from ipalib/plugins/aci2.py
rename to ipalib/plugins/aci.py
diff --git a/ipalib/plugins/basegroup2.py b/ipalib/plugins/basegroup.py
similarity index 100%
rename from ipalib/plugins/basegroup2.py
rename to ipalib/plugins/basegroup.py
diff --git a/ipalib/plugins/config2.py b/ipalib/plugins/config.py
similarity index 100%
rename from ipalib/plugins/config2.py
rename to ipalib/plugins/config.py
diff --git a/ipalib/plugins/dns2.py b/ipalib/plugins/dns.py
similarity index 100%
rename from ipalib/plugins/dns2.py
rename to ipalib/plugins/dns.py
diff --git a/ipalib/plugins/group2.py b/ipalib/plugins/group.py
similarity index 100%
rename from ipalib/plugins/group2.py
rename to ipalib/plugins/group.py
diff --git a/ipalib/plugins/host2.py b/ipalib/plugins/host.py
similarity index 100%
rename from ipalib/plugins/host2.py
rename to ipalib/plugins/host.py
diff --git a/ipalib/plugins/hostgroup2.py b/ipalib/plugins/hostgroup.py
similarity index 100%
rename from ipalib/plugins/hostgroup2.py
rename to ipalib/plugins/hostgroup.py
diff --git a/ipalib/plugins/netgroup2.py b/ipalib/plugins/netgroup.py
similarity index 100%
rename from ipalib/plugins/netgroup2.py
rename to ipalib/plugins/netgroup.py
diff --git a/ipalib/plugins/passwd2.py b/ipalib/plugins/passwd.py
similarity index 100%
rename from ipalib/plugins/passwd2.py
rename to ipalib/plugins/passwd.py
diff --git a/ipalib/plugins/pwpolicy2.py b/ipalib/plugins/pwpolicy.py
similarity index 100%
rename from ipalib/plugins/pwpolicy2.py
rename to ipalib/plugins/pwpolicy.py
diff --git a/ipalib/plugins/rolegroup2.py b/ipalib/plugins/rolegroup.py
similarity index 100%
rename from ipalib/plugins/rolegroup2.py
rename to ipalib/plugins/rolegroup.py
diff --git a/ipalib/plugins/service2.py b/ipalib/plugins/service.py
similarity index 100%
rename from ipalib/plugins/service2.py
rename to ipalib/plugins/service.py
diff --git a/ipalib/plugins/taskgroup2.py b/ipalib/plugins/taskgroup.py
similarity index 100%
rename from ipalib/plugins/taskgroup2.py
rename to ipalib/plugins/taskgroup.py
diff --git a/ipalib/plugins/user2.py b/ipalib/plugins/user.py
similarity index 100%
rename from ipalib/plugins/user2.py
rename to ipalib/plugins/user.py