Moved module name constants to their respective classes.