ref #1446 #1444 -- replaced remaining occurrences
ref #1446 #1444 -- replaced remaining occurrences

jarednova/timber,gchtr/timber,josephbergdoll/timber,gchtr/timber,timber/timber,jarednova/timber,gchtr/timber,jarednova/timber,josephbergdoll/timber,josephbergdoll/timber,timber/timber