Preparing for module name chcange described in #31