Changed names
Merge https://github.com/JMtorii/StraightComfort-Android