fixing naming and load logic