Some file rename and bugfixes in commands