revert mass-rename, we have module system