Renaming and rivets

Trying to add rivets data binding