Renamed Module to match others