Name refactoring
WIP tablet version