fix identifier of resources and add and rename things around