Switch System_GetName to System_GetProperty