CAP-11: Consistent naming (partial if amended)