Updates related to module rename and package re-organizations