Updated file and folder names for 3.3