Renaming module for naming convetion and clarity