fix names for easy reading