Fixed some renaming + creating issues