Changed naming and documentation