Fixed package naming and symbol usage to be proper and identical across all modules.