Renamed module components for simplicity and consistency