Removed import aliases, fixed #384.