refactor naming and add header filter

refactor naming and add header filter