Changing naming & adding some more snippets