Naming clean up
Factor common code