fixed module naming -- may change again