Issue #30: Changed namespaces to the new ones