Bugfix: Adapting to tills naming scheme