smartxml: refactoring - more consisten naming