Fixed module naming