More work on naming resources.