starter: naming conventions update