Deprecated (for now) aliases, and fixed deprecation warnings