Fixed issue with the namespace issue not being hard-coded in some areas.