Small Changes

Templates Renaming, etc.