rename some methods for better source readability