Renamings for better readability