Renaming module to be inline with package anme

i.e non plural