Fix some alias name conflicts