Avoid using deprecated aliases.