fixed some misnamings