fixed some typename usage for gcc