Unify the syntactical convetions in api module