Changed naming and added some documentation