Good solution but your naming convention is a little bit confusing.