Got rid of with-naming-strategy in shell namespace.