Naming revamp & add-form implementation