Fixed some name errors and lint problems.