Final code review comments, naming.