fixed some small naming issue