Addressed all code analysis warnings (note: Some minor breaking changes to follow naming guidelines)