dsl: fixed some naming errors