bug fix on naming of resources keys