Custom AppName, cleanup, and helpers fix