Fixed naming for safe parsing (GUID & INT)