Fix grammar, change conventions => semantics