Fixing non-api-like features of API, fixing terminology