Keys are now valid Java ID's

Still using UUID but dropping the inner "-".