fixes for changes to module naming