rename to make naming convention and removing 13mm version b/c it was too large
more renames to match convention