Changed mapping to fit templates to rest convention