module/class renaming to use underscores