naming convention; fix float scenarios