fixed some typename issues