diff --git a/src/Control/IPUtils.php b/src/Control/Util/IPUtils.php
similarity index 100%
rename from src/Control/IPUtils.php
rename to src/Control/Util/IPUtils.php
diff --git a/tests/php/Forms/FormFactoryTest/EditFactory.php b/tests/php/Forms/FormFactoryTest/EditFormFactory.php
similarity index 100%
rename from tests/php/Forms/FormFactoryTest/EditFactory.php
rename to tests/php/Forms/FormFactoryTest/EditFormFactory.php
diff --git a/tests/php/Forms/FormRequestHandlerTest/FormRequestHandler.php b/tests/php/Forms/FormRequestHandlerTest/TestFormRequestHandler.php
similarity index 100%
rename from tests/php/Forms/FormRequestHandlerTest/FormRequestHandler.php
rename to tests/php/Forms/FormRequestHandlerTest/TestFormRequestHandler.php