Code naming and access cleanups