Fixed a naming issue
fixed names and stuff