Refactor module definition names.