Use correct type aliases