Changed some type names so match Linux equivalents