Removed non-static API, Changed naming