refactor: remove 'fx' prefixes