Making some defs in the modules more uniform