Type in name
Rename + some refactor