Cleaned up naming (again) added more elements