Minor bug fixes

Minor naming issues corrected