Update: Simplified naming schema and edited copy