some fixes of naming