Title clean up; temporary fix for name hygiene problem