[348][WD] fixed uml and code conventions