renamed files uniform naming convention