Addressed small naming issues