Changed naming a bit