Added CQRS interfaces
Cleaned some naming up