Changed namespaces for all the screens