Reorganize some names for better reading