Fixed a few incorrect folder names for master