Resolve #6: Rename method names following TAP name convention.