Maintained naming convention (issue #202)