additional checks for api functions, naming changes