Changed naming of direction classes