Shorten project name, Change directory names to match