Rename variable
Draft 1 - basic functionality