Persitance layer naming improvements
perstance layer naming