Mininal change to keep some standards

Files renaming. Minimal changes