Minor namefixes in player