Massive renaming and more commands