Changed folder names to fit ez publish name convention