Updated file/folder names for consistency