replace hardcoded strings

pt 2
resolve #10