fixed the bullshit with the naming and the capital letters