Updating namespaces

Signed-off-by: Lee Hilton <lee.hilton@hipstercreative.com>