Fixed some name refacting issues