More renaming - no more pong references