bug fix and more better naming