Naming changes

Changes to fit the moodle’s naming conventions.