Rename config from grill.* to lens.*

Can we just delete commented code