Reverted back with module namespace.