Rename Files and Objects for better namespace