Naming from fin -> eng
also minor changes
changed naming fin -> eng