solidified seperables and did renames

*
proper renames

making sense out of things