Avoid using deprecated aliases and fix compilation.