Continue refactoring : (un)expose and rename methods + small fixes