Changed how resource_name and name_space are resolved to allow inheritance to work correctly