Revert 1d2f9899c1676e54d37514e69378a81e6390f703

Signed-off-by: Tom Haynes <Thomas.Haynes@primarydata.com>
Standardize on name

Signed-off-by: Tom Haynes <Thomas.Haynes@primarydata.com>
Break down the relationship between devices and layouts

Signed-off-by: Tom Haynes <Thomas.Haynes@primarydata.com>