added sizing and naming conventions