Merge "Rename some method to indicate that should add lock to use this methods." into main