Some method renaming for clearer api