tree 30723ab31fd824aaa317f8dd576966ce5dec5226
parent f2e570f16a540ab2385102840b6051632a07bfbd
author Jan Cach <cach.jan@gmail.com> 1499936736 +0200
committer Jan Cach <cach.jan@gmail.com> 1499936775 +0200

Fix conflicting names

Change-Id: I6fa3ebf21a131ed95b61620817ac25645ae3d3b3