fix: Fix all property, param and return types

fix: Fix all property, param and return types #2047