Fixed legacy naming