update namings
correct prompt
naming
remove time zone hack
Merge branch 'develop'