Fixed template according to our conventions and module definitions