vbrandl Change type names to prevent compiler warnings (#1)