fixing problem with module name and switching from regexp to true strings