(fix) refactored some conventions