Merge "Switch to OS_PROJECT_NAME"