Refactor types names; decimal in channels