Project and file name fixups