Renaming and fixing some stuff