refactored naming convention and disabled html5 mode