fixed some namingz