Updated module names for consistency