Added datatypes aliases + renamed class' attributes