Temp rename
Final rename
Updated autoloader