Rename layer namespaces to have an "s" in the end