renamed mappers to follow object structure