Cleaned up aliases to be consistant cross-platform