renames. NFC

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
remove redundant constructor

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>