consistent naming
consistent naming
add proper SMT-nice patch v3