Comment/naming updates