Add some aliases
Fix conflict